Partly revert rP23996.
The underlying cause was fixed by rP25229. Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D3836