Move the last of the Fortitude-specific stuff back into this gem.