Undo client change until we can test performance against staging
Merge branch 'PLFM-2635' into PLFM-2678