MDL-25834 revert unresolved PULL-174