This reverts commit 5792fabb7b712749147e9d03348c798dc1943651. I mistakenly pushed it along with the Admin API series.