Revert changes that break backward compatibility.

This reverts commit cdcc8c30f61d113dd2f2b608417b2a06c5ea9324.
Merge pull request #91.