Remove not needed cherrypicks

It is fixed on source and there is no need for workarounds