Apply CMS private patch.

See also cms-sw/cmsdist#928.