Revert to 09d640f57f78661c2d438147fa4a47a9926971df