this change seems independent of the splice related changes, no?