Fixing the builds. Re #7369.