[Branch ~dhis2-devs-core/dhis2/trunk] Rev 996: Reverted changes from r 901