A horribly broken move in the direction of the new API