Revert pull request #92

I'd like to make one more release for 0.60 before updating to 0.62.