Backed out c5dc2de8d224 (Bug 983434 part 2) for Linux static-analysis build bustage
CLOSED TREE