Fix #949, move to cryptiles