revert r77271 since it was an expensive fix to a non-existant problem.