DOCS-3701-re-redux: fixyfixy