[sd2_mr0631] Revert to YTDB