Filing a blocker to make sure we don't release the next v2.0.x without fixing #3450, possibly by PR #3468.