And remove r114997's test.