OPAL-1557 reverted as it breaks the permissions settings.