Revert "Several refactorings, including:"

This reverts commit 6e366de1707b1313f0a0480d46e910265d533cf2.