Revert to old commit, clean up history

Reverting to d6bfab2a272fa403ba590e93a9055c8162e4db0a in order to sync
up with the upstream repository. Created a new branch to hold the remote
process work so that it can be merged with the nuget package changes.