backout bug 1073317 because it broke puppet running at boot. r=bustage