Use new 2.2 definition of current_order.

Change-Id: I2b82657aa6d2170d0cf1818b86469021e8420cb7