Merge "Revert "Handle sync_fd==-1""