Merging bug 25733 throws off the timing enough for this to fail consistently on my MBP.