This has been running in production for a few months now without issues, so we should be able to remove it now.