Revert "using tap instead"

This reverts commit 669fa1e4e3209df97609a1ce76c9ab239b810625.