properly rollback #1622