Sorry Alam, didn't mean to merge menu-mpjoy-fix into next. Was meant to go into 2122-version
This reverts commit b5d4bb35, reversing
changes made to 2d675750.
mentioned in commit 140152c2
mentioned in commit 2b8cdc03
This will create a new commit in order to revert the existing changes.