Revert "Merge remote-tracking branch 'chirlu/mbs-4374' into beta"

This reverts commit dc91e15e90121b1d03e6f41208ec764d44236e97, reversing
changes made to b3b94cd1c8d3ba2ca969e6e8e1744bbef1262a6c.