More tweaks to disable company mode for now

Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com>