Backout d201add922fc and f9277c84f0f8.