Cupid patches for org.eclipse.remote