Revert previous commit due to regression issues.  Closes #18

This reverts commit 342a5916cef4c9d4c89aef37063c039dc3002cc9.