This reverts commit 9f6017d14c, reversing changes made to db1884e782. This reverts #41.
9f6017d14c
db1884e782