Revert to simple, robust parser with -e flag on db load