Critical support will be moved into a plugin later.