This reverts commit 5778ada8e5. The watchpoint tests all stall on aarch64-ubuntu bots. Reverting till I can get my hands on an system to test this out.
5778ada8e5