AUI-1353 - hacky source format