Fixed #21783: (again) Found second source of bug, also squashed it.