Rollback to MVP Fix 01

Rollback commit to MVP Fix 01
Merge branch 'master' of https://github.com/akhahaha/time-travel-shell