fixup! Server changes for resolving against non-doc-root paths.