Revert " * Nasty hacks to fix initial DB import"

This reverts commit 45c9560df63cf2417224d9e31b217fc6f4c44d51.