Bug 1030420 - Followup fix. r=me