Make the software only mode work again. Fixes #149