Revert "Merge branch 'master' into release_1.4.5"

This reverts commit c03527024b13aadf23edb06fc360c37c0247e570, reversing
changes made to 081d7c0de3c879b1fcb9d034dce5a1db7fba0f50.