Revert "Options Ordering"

This reverts commit b325f5ca8eb2d4fd4e43ac83ee2c0fe40f58210b.