Revert "Add force-yes"

This reverts commit 64ffefa0cb965fcddd75c808bc334aecd13d9f5d.