Revert "Do not just overwrite roles if value is nil."
Revert "Do not just overwrite roles if value is nil."

This reverts commit ff2aa6d7598bf3b6f182d98e88cdf5969f543892.

wollzelle/typus,burn-notice/typus,thirdthing/typus,thirdthing/typus,oruen/typus,chiragshah/typus,gkleiman/typus_3dglabs,thirdthing/typus,wollzelle/typus,typus/typus,burn-notice/typus,typus/typus,typus/typus,baban/typus,readyfor/typus,oruen/typus,typus/typus,burn-notice/typus,readyfor/typus,baban/typus,baban/typus,brainsome-de/typus,wollzelle/typus,burn-notice/typus,wollzelle/typus,gkleiman/typus_3dglabs,baban/typus,readyfor/typus,readyfor/typus,brainsome-de/typus,chiragshah/typus,chiragshah/typus,thirdthing/typus,brainsome-de/typus,brainsome-de/typus,chiragshah/typus