XFA: revert old commit, going back to BDD stuff