Revert e4176fa..b9ea92d

This rolls back to commit e4176fa56f4b3c3328f2043402eb40227ad01a36.
dev 0.1.2