Reverl last change and ommit usage of 'new' in our own syntzx only