Should fix missing dependencies when manupulating options.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit ecd3a8a8)