Fixed backwards compatability issues after TachyonURI went in

After TachyonURI went in, backwards compatibility was broken.  This patch brings the old APIs back and marks them `@Deprecated`
But it is not related to the theme of this PR, am I missing something?