Remove situational patches added in commit cbcb71ff, the problem had been addressed differently upstream.