switch to non-broken Awestruct branch