We don't need this hack any more.