Revert "All Geometry"

This reverts commit 8f119274d24f639663d33b9bb0c566e91df61524.