Revert "Merge pull request #3691 from h2oai/PUBDEV-6666"
Revert "Merge pull request #3691 from h2oai/PUBDEV-6666"

This reverts commit 4e73ce555332ee4c2bdddb896dbdfa1d0f1448d5, reversing
changes made to ce6fe9fe3427cc8c60d5bdbc05c8117b523929dc.

michalkurka/h2o-3,michalkurka/h2o-3,h2oai/h2o-3,michalkurka/h2o-3,h2oai/h2o-3,h2oai/h2o-3,h2oai/h2o-3,michalkurka/h2o-3,michalkurka/h2o-3,michalkurka/h2o-3,h2oai/h2o-3,h2oai/h2o-3,h2oai/h2o-3,michalkurka/h2o-3,h2oai/h2o-3