Removed TODO introduced in ag/4344061

After further digging, we determined that the workaround is the
best way forward.

Change-Id: If046cdd16a22f0eec63a611eb21ce5e4c875896d
Fixes: 110159357
Test: N/A
1 file changed