Hack no longer necessary, woot