Revert "Merge branch 'edition-doge'"

This reverts commit 6a0f6dfbc57cc66b5442c24a906d2ed1b0cd2947, reversing
changes made to 32f0c98c1066481d7d3784e1900ec70f3835b6bd.