Remove dead code added in r36814