Revert r55018 and apply the correct "fix" for the 64-bit sub_and_fetch atomic.