Issue #24917: Backed out changeset 09b62202d9b7