If we make this change then we should make it wholesale across all of the conflicting modules