Revert cifs, build script fixes