mls pushed an improved workaround for this for the build script. So we avoid this situation in future. (but keeping it open to let kernel people consider if they want to revert the behaviour change).