[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1429: Reverted previous commit while I debug ...