This follows the discussion in #876
This follows the discussion in #876