with a classic solution rather than a bizarro one that
confuses coverity

Change-Id: Id9427a47693897683193c0c778f0cd6c39740f6f