Revert to v 2.6