[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1448: Reverting previous commit. Solving merge problem :-)