rollback to previous state

see #commit 3d12b3d4c97946344c2950404bf6bc3d2feca557