Undo client change until we can test performance against staging