Undid the previous change -- needs more thought.