Moving tough cookie into mandatory dependencies.