Restore compatibility with 4.03.