Rework rP25266
Following comments by @vladislavbelov.
Differential Revision: https://code.wildfiregames.com/D3860