For #22 - To revert CGI support