port 465e74dce8c30263f48f522a1def89e0a4b20d00 of upstream to old 2.4.11 version