Returning data formatters to their previous working condition - Plus fixing an issue that was preventing Python oneliners from executing

llvm-svn: 155563