Revert r180737. The companion patch was reverted, and this is not relevant right now.