Remove special-case - do not merge

Change-Id: I277c8c44383920e971888c9040b6544d9228eb91
1 file changed