Remove accounting change from job004007 which causes performance regression in some situations

Remove accounting change from job004007 which causes performance regression in some situations #386