Revert "Fixed. Let the flame wars begin..."

This reverts commit 41009dccd3bb3209a3541b7d0cea60732e8693ec.