Initial attempt at fix to add chain id removal.