revert changes for DAV and OC backends