Rollback commit d820308e
Fix encoding issue #134 with backwards compatibility to ST2