Revert buggy Type modifications for now