re-add trapdoor after the rebase