Revert to non-bitfield code: 4.7 s