Revert "Cleaning up cone and cylinder to get rig of local position/rotation information"

This reverts commit 8006844276158025e6b66a9973eb3e7a7d7d6f78.