Reverted changes on local object changed solver to ensure correct behaviour