[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20917: Reverted r 20913 for now