Revert "Allow for more than one ROLE as per the spec"

This reverts commit 49907cce439cbf4f56b3233df8c9805e44220e69.