FB-13182: Fix broken exports for duncan