Bug 1078189 - Back out bug 1059023 for causing regression. r=dwilson