Revert to ff3f1279b262275429a6a6e423178cda04e42b35