Revert "Merge branch 'pr-384' into 2.0.x"

This reverts commit ff6607aacaf4870e898e89a19398bdd174138a43, reversing
changes made to ea4e7af7888f8dda01f8ffbec645cdd6e64ec712.