Fixing permissions changes from #6201