revert part of r10899 which was not intended