Backout 24b79be59bc0. DONTBUILD