Undo a couple of kludges.