Commit #469 on old python2 branch. commit bbcf6f6 PR to revert #589
Commit #469 on old python2 branch.
commit bbcf6f6
PR to revert #589