TRUNK-3949: Yet another try at fixing the build