We need some internal updates for this, shared directly with the author. This reverts commit 71b3bfde.