Revert "import into Rovi II workspace"

This reverts commit 4bcf4f26ab4bdfda1068a4ffb54f9b849f7f4dd4.