We do not need this hack any longer.