Revert "work on #197"

This reverts commit 7274e692e7c2d13d66dd8a5f51585f8ccd71a9d9.

Moving to a pull request.