am ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."

* commit 'ff220f70036178aa0d7dcf1cbc4825085a84441e':
  Remove a spurious FIXME and unnecessary type cast.