backout f1a7f2af1dce (Bug 981852) because its no longer needed. r=backout