Revert "Deleted stuff to fix problems"

This reverts commit eae6d19d2025a201793fcfa7190d0459524dda1f.