Revert 6a548cd..3c0695b

This rolls back to commit 6a548cdcbfe40ca9b540f9870073e0b8f6c131a4.
More fixes for non-shitty computers