Revert "Make hit point counts reliable for architectures that stop before evaluation."

This reverts commit 5778ada8.

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