Revert "Beasted the refactoring, again."

This reverts commit 634be8cb0c7b81884ed50fc91663662d5996a6ca.