Let's backport upstream fixes. This reverts commit 141446a4d9. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
141446a4d9