Revert "Merge pull request #15849 from jonallengriffin/gaiaunitcrash"

This reverts commit 5a0f5ee71152e7f365bf078e345422bb2b1fef7c, reversing
changes made to 6b4def088138ef7d0af42767054d353be9d3bee3.