No more need for compat52 branch since it was merged already