Reverted things I ended up deleting after commit for some reason.