Revert "Revert "WHM, etc.""

This reverts commit 3508dbe73a77e0dc37e415c290d38123dd1731bd.