Roll out r182411 and 182412 because it's still broken.