Revert "Attempt to reduce the code pyramid"

This reverts commit 0e97a92efa87e7fb9911b80472bbe1fbcc8255c4.