This reverts commit fb109c42d91c30c8c7497ef1fd7aff6f2969c6e7. Temporarily revert due to a mis-compile pointed out at D87163.