accordion removed from upstream