Backout b8a5585640ac and 8c511962d2a9. DONTBUILD