Fixed dependencies after a bad merge.

Fixes #16