Remove non formating changes from D134

Summary: Is screwed up and amended a bunch of work in progress in the commit before landing. They need to be reverted.

Test Plan:

make check

Reviewers: freetrader, #bitcoin_abc

Reviewed By: freetrader, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D136