Add experimental patch for bug 945183