Rollback to original macros