Remove workaround for missing variable dependency bug, SB-1293

Signed-off-by: Gilbert Coville <gilbert_coville@mentor.com>