Fix release build (really)

My previous change didn't really help, so here is the real fix :-)

Change-Id: I983ee3f93ddef030d583b512c19d5affdd8c541e