revert some of the changes from commit 65be1927

The refactoring in 65be1927 broke some of the old REST endpoints, and we want
to keep those funcitonal for now.