Revert modifications for Fedora compatibility due to stability problems.