Back to tracking mainstream millstone (~0.6.5)