manually revert 43fc1d7c04, doesn't work on el6