This is now just a configurable option.