Revert 5067f84d08. It is required for mobile clients