The framework for calculating "reasonable royalty" patent damages has evolved over the years to a point at which, today, it is viewed by many commentators as potentially misleading and untethered from its original purpose. We offer a proposal to modify the framework for determining reasonable patent royalties that is based on recent scholarly and judicial analyses of standard-essential patents that are subject to commitments to license on terms that are reasonable and non-discriminatory (RAND). Litigated cases have applied the traditional Georgia-Pacific factors to assess RAND royalty rates with modifications to account for the circumstances of the RAND commitment and the incremental value of allegedly infringed patents to the overall product offering. We propose that the reasonable royalty analysis should be conducted in essentially the same manner for all patents, whether or not they are encumbered by RAND commitments. We find considerable support for our approach in the historical development of U.S. patent law prior to the advent of the Georgia-Pacific test.