Bug 1024300 - Backout 72040861741d. r=burninator.