This reverts commit a79faace1b. This change will be superseded in a non-breaking way by changing to static functions and deprecating GetInstance() entirely.
a79faace1b