Breaking change edits

cc/ @codyhoag