Revert "Yet another dependency fix"

This reverts commit ab30b851cca0518690c84077d13b9ac7a786f73c.