Revert "No need for tap for now"

This reverts commit 6f6c379d3c6cbd4b1501c43e6e83ea14638dc912.