Revert "Fixed issue with order id"

This reverts commit 1781f90477b35e9c7efa8b89ce52fd8021b42bef.