Push version support back to v7