cdbartholomew
# PR #75528 / #24676 salvage