Remove an outdated FIXME

Change-Id: Ica59bd86473b45db2e1ce206ad20bea522afb5c6
Merge "Remove an outdated FIXME"