Revert r216942. This commit was premature and caused too many complaints. PR: 162859 MFC after: 3 days