Revert to c28f3d52cff05d5b780591aebbcb242ffa9edda7