Seems like there's an assert in here that we shouldn't be running into. This reverts commit 515973222e.
515973222e