Undid last commit (binary causing segfaults).