[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9202: Revert 9199.