Revert 2ef5dec4660476467844ac12ae785a8944d5bc9d and add source encoding to deter build warnings.