Revert "Order doesnt respond to token anymore"

This reverts commit b7d3bd708b2bc8c4ed9fa17fbb111e814bfa1824.

It breaks 2-2-stable compatibility on master. Leaving it for now until
we push 3D support to 2-2-stable branch.