Revert Issue #2282933 by sylus: Fixed Menu Block support UUID.

Needs more testing before confident won't introduce regressions.