Reverted r88023 per CR