Re-enable the hack that makes the world tick, one day we'll get rid of that