Is Tap Water Safe to Drink in China? (Boiling vs. Bottled Water)

I'm putting together my first China trip and this is the bit I still can't quite get straight: Is Tap Water Safe to Drink in China?. I've read a few different things and they don't really line up. If you did this recently, what worked for you in real life, and what would you sort out before arriving?