Backing out r174919 while I investigate a self-host bug on Takumi's builder.