Turns out the cause was slightly different. Fixed now.

See also #978