Bug 975277 - Followup bustage fix for the very recent removal of shortId. r=me CLOSED TREE