Isn't the 4.0 client supposed to be reverted to use these old types?