Revert "Merge remote-tracking branch 'apache/master'"

This reverts commit 8746ab9a1b1dbe908710822c413169eec684a336, reversing
changes made to c8d2b9e1675c24eb506d204da09d1799f38414b0.