Back out b3bdec87d963 (bug 840722) for causing bug 842418. r=me,a=lsblakk