Removing some incorrect code introduced in preview branch rollback