Backout fix for FIRE-9687 in prep for a more comprehensive fix
Backout fix for FIRE-9687 in prep for a more comprehensive fix

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm