Fixes cms-sw/cmssw#1621.