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

This reverts commit 397e760a5cc53277f6a93c92326db92c9527c1a1, reversing
changes made to 10189a432be1736679bd162157cd5e48952b3eb1.