Revert b370e46b370e46... Put longest options first