tune for franco interactive and remove more mpdecision calls I
missed last time

Change-Id: I526ca748ac518b4aa08769a9961b326811f960dd