Replace kludge with simpler kludge.