backout b0fd368ba5ec (Bug 959742) for build bustage