This reverts commit e1cc9e4e. This causes some non-trivial text size increases in unoptimized builds for Bullet. Revert while I investigate.