Use new way of enabling guards.