oops, we still need the ?=, of course

Change-Id: Ifa3e6639a5fdbd58e99fe3f1feadc009ddcee880