Take our own fork of macaque instead of upstream