Removing compat module in favor of inline changes