This is a temporary fix until we fix the behaviour of borrow=True
for the general case.