FLUID-5080: Reverting UIO demo