Revert the erroneous change committed in r169286.