Please revert this change, it impacts other parts of the database API.