Back out a couple of broken changes

Upon updating the Fedora package I noticed a couple of problems. Some of them were actually previously fixed problems reintroduced.

Unfortunately, from the commit messages it's not entirely clear what were the commits supposed to fix. Let's remove them, and if there still are problems perhaps they could be fixed with better explanations?