Rollback to Michaels patch
Applied concurrent modification fix as a separate patch