Revert "Anything is better than this..."

This reverts commit 3d2438d389e76ff066804ffcf9bc7b7ac0eef6a7.