Revert "Merge branch 'timeline-gem'"

This reverts commit f6debd08778c7d16fd2a0316f5cdf8731169e986, reversing
changes made to b82b7be9046059ed9fb4cfd22822269faa23a251.
add reset