Remove circular dependency.
Reviwed in https://codereview.appspot.com/7506043/.
4 files changed