This was disabled due to lack of vanguard support. Now that we support
vanguards, we should enable this by default.

Fixes: #1402