Revert Gaufrette implementation