Pab/devel

I think  it's better to revert the last couple of patches - they break a bit more than they fix. with the axllib tests in place it'll be easier to get it right.