Bug 1047831. r=ehsan, a=wchang