This reverts merge request !6 (merged)
Should've only merged linting, but I branched from the wrong base.