Unbreak stuff broken by previous commit