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.
Merge pull request #19 from supermads/patch-2

Revert old pull request