Reapply r142781 with fix. Original message: