Adapt to 4.2b1-pending