Revert "reset master to track upstream master as exact copy"

This reverts commit 66b408f5d0db413d07559d5edb75d44a3fb8a104.