[builtin/trap] Revert part of refactoring