Bug 998370: Rollback bugs 997759, 989232, 985720, 985623 in beta (r=backout,ba=sledru)