Revert "MT#7959 Fix test for mr3.3.1 (cherry-picked code had newer error message)"

This reverts commit f2b8d7f68143df18b68723aff9cc9106bb7a065d.