Bug 839454 - Backout since this is not the cause of the regression. r=me