DF-5129 revert after bad merge