Initial rough sketch of fix for pr12905.