Reverting 3558dd87ac.