This reverts commit 38010f8c. I am removing the patch because it contains unapproved changes to Mk/ while the approval for the following is pending: PR: 289938