Comment on revert of potential fix to #870.