Tagged compat-4-removal by niels@thykier.net