This hack is not needed anymore