[Branch ~dhis2-devs-core/dhis2/trunk] Rev 27: Rolling back some changes.