Fix taint by recent merge

Change-Id: I1c3fdfeb0fbfcc9c6fa0e97d76a2eea41168a4d6