Merge pull request #169 from dfcoffin/master

Reverse pull request #166