fixing some diffs between upstream and branch. not sure how these changes got here