PR #3623 breaks the official tool. 
PR #3623 breaks the official tool.