Remove use of @changes_database flag