Removed cgi from core, removed patch as fixed now.