Bug 944913 - Partial revert of a41081c1026c due to build bustage.