ensure backward-compat with 3.5b1