DO NOT MERGE: Fixing Entities

Were you using `_call_client_post` directly?