Re-submit r207884: Remove dead code

Differential Revision: http://reviews.llvm.org/D3599