Address concerns of rP20321
Patch by: Dunedan Differential Revision: https://code.wildfiregames.com/D1378