[chromium-freeworld/el7] REVERT: Removed more changes from a missing commit