This hack is not necessary any more.