This is a combination of getting stuff merged upstream, and removing the need for some more specialist features.