This reverts commit c1e638abb6. As pointed out by wkennington, upstream disallows all cases as of v207
c1e638abb6