Revert "Fixed failing order completion"

This reverts commit ccea918f8f11f0e05f8179e21eda89b3ecedd946.
Reverted earlier change