Fix Nightly on a known good version due to bug 943898 which breaks tests