Revert "Base: huge cleanup"

This reverts commit bf850274ed4e14bdca9e552b09a85dd186afe0f5.