Reverted some changes that should not have been checked in
Several hamzilla-related fixes