@mollekopf After this commit (and composer update to make sure we're up to date), I see these phpstan warnings. So, this needs to be reverted.