Not sure what went wrong with phabricator. The email contained a good patch, though, so I went ahead and submitted it as r188793. Thanks for working on this! http://llvm-reviews.chandlerc.com/D881