The FIXME is a leftover from the expired code flow. It is no longer
valid for the current codebase.

Change-Id: Ic498e6d5c59581b559eacc087a98479e8be37555