Bug 833653, backout cba08521d30b