migrating from click to tap

@zacc r?