Revert "Ticket63, update 1"

This reverts commit f1507bdee327e4e03fd981c0179c5e9256e3e5f8.