Revert "Merge branch 'mt/patch-id-stable' into next"

This reverts commit 0188d44bb409916a5e96cf6d7160e9e9ed064cc5,
reversing changes made to 6b74773678cb408b7edb236752e514fa00488637,
to replace it with a new round to be cooked in 'next' for the
remainder of this cycle.