Backout Bug 854117 because philor said so