Revert commit 103335a5 and use the latest version of Nightly now bug 943898 is fixed