MBS-5666: revert my fix of MBS-5666 due to controversy