Revert "Fix --force mode of build client"

This reverts commit 428010432415b81a42960be825c6b682706945fe.