Revert "Worlds greatest change"

This reverts commit 863df0f78627b53514d9cef58f716c4a215534c2.