Revert 5b21b58..7142421

This rolls back to commit 5b21b58c2093dbf7efdf50ba68e9bf5e084b01ae.
Revert "Revert 5b21b58..7142421"

This reverts commit a4ac44de08e198717ccc723cb95c2e7ec3732b2f.
Revert 71e1f07..d5b6445

This rolls back to commit 71e1f076f82ddad5330357c077d23231f3169df3.
THIS IS THE ONLY TRUSTWORTHY COMMIT

JUST START FROM HERE, if you ever get stuck anywhere while making files