Restore 4.00.1 compat