Was this order switch related to legacy removal?