Item12705: clean up George's functional-but-not-quite-right fix