Backout 77ae3657aab0 and b0d2a29fe4b0. DONTBUILD