Remove gratuitous obsoletes and fix the build for good