Revert "3A32: Merging everything."

This reverts commit cc3f77fc40693e5f0d89f017d44ad320194975ac, reversing
changes made to bed7b7ba86c10a4fcb691d24895cce868cf625e8.