Issue #2362641. Restore Role check broken in 1e9927d3.