Fix that patch ... again.