Disabled at startup now.
Ticket kept open for other suggestions.