Revert "First stage of Auth Provider refactor"

This reverts commit 2b374fe22aeccfb7bb762f28ad5bfb9942b3e6b1
Merge "Revert "First stage of Auth Provider refactor""