Rolling back, waiting didn't work.
Merge TFS Changeset 173