This has no additional patches, but it does result in a whole host of
test suite failures.