[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2554: Reverted r 2548. Will add parts of it back later

revision-diff.txt (14.7 KB)