74c5118
Apply vendor commit 654f1b3fc5, this is slight different from our version as discussed with upstream.