Re-added the CIFS-Linaro fix from PYD-X