Record follow-up experimental patch for Issue 618