This reverts commit 573d56f9. We'll include Icedove as a tech preview, initially, so it shouldn't be considered the default.