Revert "test trap adding"

This reverts commit af2db3f026bed8a68a83c2ebcf7edd933480fdd2.