Reverting 178851 as it broke buildbots