revert to simpler form handling in chain