Back out ee5f1c7 (common DAO interface)