Revert "Once more with feeling."

This reverts commit c8da368a4ed7d9db053e01af9edb0ea65f57f6da.