Revert "Merge pull request #37 from cppljevans/context_debug_fix_swap"

This reverts commit 527e54b549a654f8454b14dc5e11fd9d11c628bc, reversing
changes made to 3928caeb3d9120b135dbd17af7dc25c89fe73a82.