Revert "URI is transported in intents data not extra."

This reverts commit 2f0075e043daab6d59e38cdb110960895a06a2b4.