Revert "Retrieve data from new table structure"

This reverts commit d4220bcad9db10b5e042a54215b89fb2cd28e0d3.