Revert structure to the original state
BFQ v7r5 is here