Roll out r182407 and r182408 because they broke builds.