correct (for reals this time) dependency management

R=arv
BUG=

Review URL: https://codereview.appspot.com/50000044