Revert "Did stuff to the reverted file"

This reverts commit 90a45c01c138c977ea16c228e9ed5fa3302543e2.
Revert "Revert "Beasted the refactoring, again.""

This reverts commit 610a2d5a7b5c1daa55f652acb53124d87be1dfd5.