Revert "Upgrade Blueprints and Pipes"

This reverts commit 57389534746dc9ffaeda5ffc3a749fd1554472ed.