Restore sensible fmap