Bug 997946 - Backed out changeset b06d5a4eb728 due to bustage.