Revert change accidentally committed in r191150.