Restore class used by walkthrough (fixes #1579)