Reverted web client changes as it breaking CPS functionality: