MDL-25501 reverting PULL-95