Back to snapshot, working towards RC3 or GA