Removing FIXME

As we did in master.
Merge pull request #9613 from arunagw/remove_fixme

Removing FIXME