Revert "Add fix to gentoo bug #521776"

This reverts commit ba9c6bc5aaad12759d5488f5e7db575d3c641af5.
Fixed in main tree now.