Refix an accidental revert, and hide Bullet classes from public API