Add support for reproducing 2.1 kwsplat