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

This reverts commit b2ca44bce2f3c51766ecb2b666ac7a3a91679ad9, reversing
changes made to 965b8461ef3f68e7953f57772da424715658af3d.