rollback to previous state

see #commit da94eb22ec97bd01133c9d5a5af184e9c3f55bdd