Revert closed roles merge: #1523
Merge pull request #1559 from alphagov/revert-roles

Revert closed roles merge: #1523