Restore upstream Touchy