move back to upstream KIF since multitouch merged