Patch for Remote.java (diff -u)