Revert "Canon"

This reverts commit 6dcfa87d82ad56d3d4d1db1d7657014989c93f35.