Oops.  Cleaning up from pervious merge.