Restore compatibility with pre-4.02.