Revert "Nominalcollision2015 default"

Reverts cms-sw/cmssw#6751