- Revert 32309 -- instead of removing FORCEINLINE to make GCC happy (it can't inline...