Revert "Modify metadata provider to support query other tables."

This reverts commit 20521ce66e4a90fe16a4e55368e60bffe264c525.

Change-Id: Ibcfaee186fdd37a69ee748a115ebef2867bce734
3 files changed