Revert "Base: huge cleanup"

This reverts commit e705ac7c12d42c8ce3453c22f5a73989a9583dda.