Reverting unintended change of r76326