Revert to dynamic client detection