This seems to work after the 2016-01-22 rewrite, can probably be closed.