Reverting h2 changes #3266