restored upstream master customer-private