revert back to previous state
Merge branch 'old-state'