Fixes compilation on buildbots. Removed upstreamed patch. Changed URL to a sensical one. Signed-off-by: Rosen Penev <rosenp@gmail.com>