Bug 960146. r=kats,wesj