revert the temporary changes which don't compile.