Revert "Whirl"

This reverts commit 67cd42e9f8fa78862ea1cf6182fc1a27b445abb8.
Update