Revert "Base stuff we need"

This reverts commit 24585df1c3f1041e452c5ad24aceefae5f491a55.