Revert "Temporary hack out reentrant user database functions."