Revert "Finalized. For now."

This reverts commit e10379b35f5a3e70af830bf4921cd526180e5834 in order to
fix a botched merger.