Finally back to square one after the merge with the upstream repository.  Now onward...