Revert "fix merge"

This reverts commit ac3fc86c911b13e45317a44232bbc34d93545ef8, reversing
changes made to 5394af1bca137e1ceeee6bc9603a92a38daf767f.

Conflicts:
	SLHCUpgradeSimulations/Configuration/python/gemCustoms.py