Revert closed roles merge: #1523