Revert Uri class due to bug 39710