Restore compatibility with 0.6.9.