Roll in bug-fix (d494d5f6e3 from tonsky/datascript)