Revert "Build 21 v2"
Revert "Build 21 v2"

This reverts commit 90e7aa9943e678e43f0c5f6460956cf37a277359.

schattenan/EschwegeCarreraProjectInC,schattenan/EschwegeCarreraProjectInC,schattenan/EschwegeCarreraProjectInC