Revert "Merge branch 'mbs-6529' into beta"

This reverts commit 30b543cadfb34300954918b02b1580c2a0bd9cad, reversing
changes made to 13b8723b0b3c21dd3199611d2a92462da50f1c80.