No actually @sebersole explained on IRC why I can't really do that. Need to find an alternative, as removing one field only has no benefot because of size alignment :-/
Maybe we could have an optimized implementation for the case in which the key is using a simple type && no tenantId is being used?