branched from other branch instead of master; reverting changes that were in the other branch WEB-7951