Fix binary compatibility with 0.13