Adding back in some of the removed dependencies.