Revert "Updating FS URIs to fix minor problems." since it caused
the tests to fail.

This reverts commit defb8bd64ed77c7841fde5ea8c5904074c26d9f6.