Simplify fix for Issue 7666.

http://d.puremagic.com/issues/show_bug.cgi?id=7666

Simplifies https://github.com/D-Programming-Language/phobos/pull/1244 which was pulled.