Follow up to closed PR #1677

See #1677 for discussion. #1677 was closed and doesn't update itself with new commits anymore.