Revert "PipeNew form change"

This reverts commit a4251b97069a8b4e0a5d928619c058e46864ff0a.