Part of our effort to clean up the sbnc codebase.
Bug watches keep track of this bug in other bug trackers.