Revert d516d704a6 to modify its base