Bug 15263: (QA followup) Make *shelves.pl use the new API