Frick Collection Replaces Controversial Redesign Plan with New Overhaul Proposal