Bug 1022229 - Followup bustage fix. r=me CLOSED TREE