Historic commit for v1.15: fix broken sorts, all should be ok again