I would be really really hesitant about changing any of the MPU6000 init code.  It was a lot of random trial and error to get to a state where it works on all the platforms for battery start, bootloader start, and reboot start.  I'm not sure why it's been so temperamental.  However, if these changes were for a particular reason please say and we can do some testing.