@dmitchell locator's include the course_id, right? It seems like something using the new locator aware apis shouldn't require a course_id explicitly.