Fix for #1699 (a bit of a hack - ultimately want to add an API to
determine what file formats to expose to the user)