Regression tests fail, so going back to old master here until golden copy dump is re-sampled.