Comment by concinds

It did, yeah. A merge the other way would have probably been a bad idea too, they should remain separate.