Revert "Merge branch 'patch-afssrv' into 'master'"

This reverts merge request !87 (merged)

Reverted since hostgroup-afssrv has a commit message filter.

[[:upper:]]+-\d+

on it. I like that fact but it breaks modulesync so disable for now.