Revert "DB/Nav is fucked"

This reverts commit c68b1ad854a9d02b541df2185fd953974ca0fd74.