issue #20044: Incremental progress on getting patch to work.