Not enabling this system yet due to a race condition