Re-landing with an erroneous assert removed. This reverts commit 58d104b352a65bec3fb7a8fd23bf2d408b4c76f7.