de-andrey-fied it (sort of)