Revert "Optimizations for when I get this building"

This reverts commit dd85964bf7c12297c63a1f2611f0294b558acad3.