[gh-390] Update Eric's code to not rely on new database fields

This would remove the need for the new, redundant database fields.