Further simplify r206430.

rdar://problem/16636569.