Revert "Apply build-opts.patch"

This reverts commit 179382abe13606f9ec7f8756369b44d7b7ba9e13.