Backing out FIRE-11836 fix due to FIRE-11967.
Backing out FIRE-11836 fix due to FIRE-11967.

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