Another attempt to fix botched commit