Revert 3e8cf82..9255620

This rolls back to commit 3e8cf822b091a8a0bb1e272322033ae8f28d56d0.
latest commit (try hard on filling table from list