Revert splice. Looks old and buggy now :(