Done- although I'm not sure we need this at all.  See note in code.