Fixes all sorts of configuration problems introducec by dad7a9c7
on non-Linux or non-vanilla configs. Also removes a line made redundant
in that commit.