Revert "Merge branch 'master' into exchange-experiments"

This reverts commit 01093bb00dae5af6d54febf2eee385ba60043440, reversing
changes made to 21c09a2a9d19f5215e55f7d77d41f7d0c3c57ee0.