Revert "Maybe it's problem..."

This reverts commit 37001dc90224421bff47bbc309212734882489bc.
Revert "Remove because not working"

This reverts commit 66862320951760470d264cc11f13f136481d6e70.
Trying this way to not need patch vendor