Cleanup: correct idiocy of previous commit