Revert "Fix dancing cwm"

This reverts commit 34f059e8a95d6c997aca91d199a912af5b851eef.