Fix merge taint

Got deleted in remerge

Change-Id: I94b64a580c729a2591320b5d83572b72047c9397