Revert "Updated to simplify admin load"

This reverts commit 5300ec9601f3407bb765ace31d461d136213b5f9.