Revert to e51ed6bf10db39fe32d486c3d8d10e3972531220