Revert "rename None to NoneType"

Authored by brauch on Apr 17 2017, 12:34 PM.