WTF were we doing `tap` here for?