Revert "Merge remote-tracking branch 'origin/archetypes' into archetypes"

This reverts commit 4cb99d64040a313574de7bbb2ad6b43967836bc2, reversing
changes made to d75a31e02aee249194c6b4cd90b188b4aa758cd5.