This part seems unrelated and might be worth explaining in the commit message (or be split in its own commit)