Patch for Trac:9934.