Fixes cms-sw/cmssw#4041.