Reverting; although this passed many times, it's now failing :-(