patch in Machine.run reverted since experiments show it does not cause speed-up