Undo unwanted commit r29310.