This change was previously done in //third_party in CL 108656107 but never made it to the open source project and was overwritten in an update.