Revert "huuuuuuuge commit"

This reverts commit 5edec71c142965f71116e34be7f08e41dde018d6.