This patch has already made it into 2.4.21pre3-ac4. Please apply.