Temporary changes to accommodate nokinds.