All tests passing again. Ref #525.