Bug 1094068 - Fix regression in add-on SDK