...that is sporadically observed on tinderboxes.  (Can be reverted once the
cause is found.)

Change-Id: I74135b3159fe686b7d7da33da569bde6c73b89e2