Revert change made in r142205.