WIP: Re-add hidden permission of overridden groups.

#6060