reverse upstream "fix"