This flag has been defaulted enabled for many months, and have had no
issues. It is overdue on cleaning up.