Revert "we will track this ourselves"

This reverts commit e87dcb5366c57d89322099c884f8cc2f6b76e3c0.
Revert "Add cm's trebuchet"

This reverts commit dca1c9126cde715d3fbf904a820cd4a997f905df.