Revert "This is a followup to https://reviews.llvm.org/D129814"

This reverts commit 555ae5b8.

Apparently, there's something different about how Linux ARM handles watchpoints,
as all the watchpoint tests seem to stall on the Ubuntu aarch64 bots.

Reverting till I can get my hands on a linux system and see what is
wrong.