Remove a kluge that is no longer necessary.