Re: 2.4 and contrib