Fix bug introduced with #5944.
Merge branch 'CMSSW_7_3_X' of https://github.com/cms-sw/cmssw into 73X-fix5944
Merge pull request #6094 from vadler/73X-fix5944

73X - fix #5944