Maybe a better approach is just to remove this hack from the profiles altogether. If this results in some issues for mc, it should probably then be fixed in mc and not system profile. We end up with these legacy hacks that then becomes zombified and passed on the the next generation. With this one, it's almost literal! :-)