This breaks site creation: the site_id and other parameters are no longuer saved in the drushrc after this patch is applied. This reverts commit 5e9df86344397f47030e31840e14fb3c93c69b11.