journal
Revert 34813e9..dec8388

This rolls back to commit 34813e99d7584481d6f8b3cdcbb87ede924f2efe.
Roll back #201
Roll back