This fixes the regression introduced by
I0f5f1d68d686fdbfe90393ae93ebaff9cd11ffe6

Change-Id: I10417e4a4297977d8879a387ad06d439c4028a37