A setting called "Auto Renew Requires Product" located under Setup > General Settings > Domains tab now faciliates this.