Revert "Trying to switch scaffolding up"

This reverts commit 55a3a26cb6d54936562458b1fedcfdf916219b09.