Re-add support for custom and already created geometry.