Revert "Temporarily use the old paths, for the cutover."

This reverts commit c399b6977b9fd9c9f36da897c0d37f55cd5de310.