Revert "A few big bugs hopefully fixed. Timing on has ACK changed."

This reverts commit 40b3e10fb28c10d70f1868846cf7309c151d5431.