Put some by-hand touch translation back
Merge branch 'master' of https://github.com/Downstream/ds_cinder