Adapt to 4.4.2_r2