Should this be `e81b4b808359e2def9eeeabfdee69c2989e1fe96` instead (the commit from the emissary pr)?