Restore binary compatibility with previous versions.
Merge pull request #98 from square/jw/binary-compatibility

Restore binary compatibility with previous versions.