Should this be behind a waffle flag? Some of these APIs are really high traffic and should be tested well. I'm not sure how well they are tested by QA, because they haven't changed in so long.