Oops.  A little too much merging between different versions