Revert "Revert "expedite: fix for 5.5 compatibility.""