Updated patch file from Drupal.org Issue #2067229, Comment #41.