Trying out the changes from http://community.zenoss.org/docs/DOC-12909.