Cleanup HAL-422: support plugin not available in 2.3.x