Bug 1007756: Strip out redundant and broken code landed in bug 990074. r=fitzgen