Backported binary compat fix to #83