Merge pull request #2336 from apache/1523-bye-bye-5986-rnewson-4

1523 bye bye 5986