Left to do: re-enable as needed in the usual situations. This added ~286MiB to the base system closure, which is enough to bring the sd images over the limit allowed on Hydra.