Revert "Merge branch 'refs/heads/phatmann/collection-view-taps'"

This reverts commit 9702358e2f6dccc6e1d1d0d62c1b1c84634355d6, reversing
changes made to a5a94c7173a7ebc68338b3f47861134bdc36dbd4.