This is from PR #822, please discuss it there.