Blind fix for red Tinderboxes, following

Change-Id: I590a682af7fc1879ae63cda3aea73063ba4c84f4