Blind fix for red Tinderboxes

Change-Id: I9465943a7e3c0d485e8692e3e1ea0b258d67d120