Revert to previous version to stop mustella tests from failing.  Work will continue in seperate branch.