This is part of #5965.  It needs to land before the rest of that PR, so we can
land servo/saltfs#28 without breaking automated builds for other PRs.