Cleanup after buggy commit aedef8c804c715b13793685f8ae2e66e77eaa546