Please don't take this out. It's still hitting the db and it's still an outstanding TODO.