reset to upstream version, backoff is simpler
recompile