Remove upstreamed patch. Switched conditional dependency to python3 in preparation for deprecating Python 2. Signed-off-by: Rosen Penev <rosenp@gmail.com>