This reverts commit f3a089506fdcc4a1d658697009572c93e00c4373. 888951aaca583bcce85b42ea6166416db8f96fe0 introduced a fix that should make the disabled tests work again. rdar://problem/62141412