VP-297: Update Mammals demo to new scheme. Not quite working (due to FLUID-5023)