Revert "Make common role more generic"

This reverts commit 234887645878acb302d0189fe8a299d1d00b258d.