Revert to 60a7957e61f0dc7507303ab8e7e577dc7f7b3782
commit before switching to the world cup baby branch