Reapply r60997, this time without forgetting that