Backout 9056f9846d0d and 1c80de65cc10