#345: rollback changes