Commit a52bc039c33b3c01dbb96b815dc24df7f03bc4be

Behdad Esfahbod 2018-10-09T00:56:33

Properly remove deprecated stuff