Merge "Revert some changes made in ag/5883994."