[OE-5215] revert roles bug fix