Revert "Add support for kicks"

This reverts commit 380dc75c2f0e6a6ff4fd0d8bd4af611b1484b032.