Cleanup this nasty hack tomorrow