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