Revert "Cannon bugs and features update"

This reverts commit 7f7d1e6f31a7c104de3d96b5fdc81ebb466b16bb.