Revert what looks like an unintended change in r215557.

Should fix test ulibc driver tests.