Move to cms-sw/root@04ffc3

- This reverts the TH1 fix since it still does not work correctly.