Whoops... this never restores a previous setting :|

Change-Id: I2121742fad76affbff3089c59a5cfaf49d9e2b24