--- a/hgext/infinitepush/__init__.py	Thu Feb 08 17:09:24 2018 +0530
+++ b/hgext/infinitepush/__init__.py	Thu Feb 08 17:12:53 2018 +0530
@@ -190,7 +190,6 @@
     default=False,
 )
 
-pushrebaseparttype = 'b2x:rebase'
 experimental = 'experimental'
 configbookmark = 'server-bundlestore-bookmark'
 configcreate = 'server-bundlestore-create'
@@ -365,12 +364,8 @@
 
     wireproto.wirepeer.listkeyspatterns = listkeyspatterns
 
-    # Move infinitepush part before pushrebase part
-    # to avoid generation of both parts.
     partorder = exchange.b2partsgenorder
     index = partorder.index('changeset')
-    if pushrebaseparttype in partorder:
-        index = min(index, partorder.index(pushrebaseparttype))
     partorder.insert(
         index, partorder.pop(partorder.index(scratchbranchparttype)))