revert back some type changes