Given is "experimental" as of 5.18, remove usage
Workaround issue where client data is out of sync