(at the expense of effectively disabling the check in that case, though)

Change-Id: I57a0f4f815e8e8dac09e8695f3281504a6501569