Undo system change and a minor tweak.