PR #3623 breaks the official tool. 