remove bitfields for now, they're broken