Will try to remember to have it as a toggle in the next build, at least until a permanent decision is made.
