Revert "Merge commit '38a9e52e616c7e7e1c7fd38acb033057cdc344c8' into project-master"

This reverts commit 6d6e8a89adb199943d13db69312f432abb9b623a, reversing
changes made to c792386bbdb3848bd8dd4b2d1e04e5fee0d4bac1.