Backout cb54921d1abc for bug 1013870, busted build