Database Functions
Revert 0ddec4d..ad6683d

This rolls back to commit 0ddec4dc90dc5f8c82738f3f238168ac1ffdc103.