While this does fix a breaking change, it is also, technically, a [breaking-change] to go back to our original way