Revert changes from #2. This closes #8