Need to make this 0.7.0 - breaking change for users of Frodo (see Changelog)