The dispatch_once solution never fixed the leak. Reverting this for good.
This is no longer needed.