Removed commented-out fixme (not the content; just the command) so we don't stumble over it with grep.