Revert "If this breaks anything role back, I don't know what changed"

This reverts commit 669504cc955cdd820f4dd68772aab87b57fd4327.