Revert some changes made by commit 5f7ddd922d

+ too much code cleanup ('make install' error).