Backed out changeset ca5b7ed0dd5a (bug 973815) because of build bustage