work on bug 917227. patch for bug 919072