Removing FIXME

As we did in master.