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

This reverts commit 6bef2aa02e57b19b08242f7c7faf884bece212f2, reversing
changes made to ba38f96f0319ec38f5a9755b55f6e5434235de27.