Backed out changeset 3fcdc52fc85f (bug 947939) for troboprovider bustage