Disabling compat for now, not needed