Revert old pull request

Revert old pull request since we're going to update the database instead of trying to fix this on the front.