Apply PR #116 manually.