Backout 9724e3b5f080 and 10cfcee6e4c6.