revert the data structures to fix compilation