I forgot to mention this is blocked by https://github.com/Elgg/Elgg/pull/6338