We omit the work-around commit 0b7fa5a0
because it appears to be needed for CentOS 6 only,
which we no longer support.