Issue #22676:undo 17134 changes and order inventory availability by sche