Reland changeset 6b85b16dc226 (bug 958940) due to accidental backout rs=jesup