Re #6131. Fixing the builds.