Revert "Always use force"

This reverts commit a6da90d70a89f78923a866157a58b17f54de52a7.