Bug 1113391 - Followup to bug 923897 r=me