The fixes for 5.17 conflict with cleanups made in the same area earlier in the 5.18 development cycle.