It was also plagued by years of flooding and drainage problems and by various turfgrass issues which affected the greens and often produced less than satisfactory tournament conditions.

In the summer of 2005, Dewberry and Davis land surveying crews were regularly seen taking measurements across the facility, sparking rumors that the long criticized course would finally be reconfigured.

Confirmation came in 2007, when a $32 million golf course and clubhouse renovation commenced in an effort to bring back a tournament to the Washington D.C. area.

The controversial sixth hole (conceived as a weak copy of the 13th at Augusta National) was changed to a straightaway long par-four with the green now short and left of the creek.

In November 2015, the 7th and 16th greens were renovated to flatten contours and provide additional hole locations in anticipation of hosting the Quicken Loans National in 2017.

"[3] In 2010, the Constellation Energy Senior Players Championship was moved from Baltimore Country Club in Timonium to the TPC Potomac at Avenel Farm.