Revert changes from #705
The changes only set permission related attributes, but we also need to
set the descriptive metadata too.