Kill this awful kludge at last.