Revert "Singleton in progress..."

This reverts commit a376a6b98ab89bbc438cedc1a888604383d63b4a.