This change isn't relevant to the bug, is it? Not that I'm against a simplification and getting rid of a useless join, just want to make sure I understand things right ;)