Revert to non combined version to save problems.