Revert "Merge branch 'master' of https://github.com/hyperic/hq into 5.8.3"

This reverts commit 520bae15900cc24d178deed17213e24f8e8d4e21, reversing
changes made to d134a12c079381d5cc6e3a5962f0d95584341bc4.