Revert "Merge branch 'test.FastCaloSim-20190501' into 'master'"
This reverts merge request !23097 (merged) as another merge request (!23085 (merged)) rendered the changes unnecessary.
This reverts merge request !23097 (merged) as another merge request (!23085 (merged)) rendered the changes unnecessary.