Undo changes

Undo some changes which do not work with patch-2