Revert d358adb