backout bug 1063852 (84ac3d72395f) since that breaks Gij. r=bholley to please the dom/ hook.