Revert 2853eb41 's changes to traitlets