remove setup code from zamboni (bug 936680)
Merge pull request #1404 from andymckay/936680

remove setup code from zamboni (bug 936680)