Revert "ADMIN: changes following Dawn refactor"

This reverts commit a8dd05430db7bf2ae24eeec79e22942d4023683e.