Rollback structure to respect Makefile