Revert previous commit that breaks compat