These changes need review.  Looks like it'll break.