Backout 69acb8830b8c for real.