Apply FLUME-2184 to allow the build to work