Revert "traps"

This reverts commit 228d77b89a7843f478ab529f894d31d60914a05a.