Collection: Reverted change with dialog and removed old code.