This reverts commit r200064 and r200051.