[TESTING] Make ordering optional

Ordering option was available 3.3 and up