Revert e9f9dd8..061921d

This rolls back to commit e9f9dd8be7bf94f8237e8724e9d408299f0d7fd0.
working version