Workaround issue with 6.3 autobuild. Fixes True20