Readd the workarround from the old version again which was removed in r22296 and refresh the patches.
This should close#7874
Thank you Russell Senior for testing.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23911 3c298f89-4303-0410-b956-a3cf2f4a3e73
