Reverted changes on pclaim