Revert efa5d81..792fb7d

This rolls back to commit efa5d819426f263b2009bbeb94e16fd0292752c9.
Messing with DB