Revert "Big Order ID Refactor"
This was headed for a sandbox and ended up in Master. Oops.

This reverts commit 0eaed7fb54c6f9a8e73eff2b5abd8bef1020cb25.

Change-Id: Iac63e329fd115ee1159e0e3caf2c66541138b275