Reverted and modified copy for some client changes.