@todo Remove this fallback with version 7.0