Revert "Add back r203962, r204028 and r204059."

This reverts commit r204178.