Bug 1081703, r=khuey.