revert merge mix up

Change-Id: Ia144c73fe6078ec3ed0e18e3aabc242759e81b89