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

This reverts commit 7c907a54d55b8bee70147020dd894182ef8a7add, reversing
changes made to 53537f56c23d17d632d2308b6639a6008ab75bf9.
Merge branch 'beta'