I'm glad we can finally get rid of this awful hack :-)