This uses the previously commited new syntax.
Fixes: #3400 (closed)
@matzipan can you mrtest this to confirm this fixes your issue.