First do a proper port, then add a fallback to 2.4 that can be reverted once we can rely on soup3 being available.