Revert r93388 because it was a fix for r93386 which was reverted.