Backout 1fb64f0d7067 (bug 854758) for being the wrong fix